meson: examples: update

Mostly style changes. Don't create resource source files
with spaces in them, that's tempting our luck.

diff --git a/examples/application1/meson.build b/examples/application1/meson.build
index ae5620f07ec633dbb87be38e87968a382e6f70dc..172c1d3b1c950dbdf452804de8df0308891bdb2c 100644 (file)
--- a/examples/application1/meson.build
+++ b/examples/application1/meson.build
@@ -1,11 +1,3 @@
-
-
-app1 = executable(
-  'exampleapp',
-  'main.c',
-  'exampleapp.c',
-  'exampleapp.h',
-  'exampleappwin.c',
-  'exampleappwin.h',
-  dependencies: libgtk_dep
-)
+executable('exampleapp',
+  'exampleapp.c', 'exampleappwin.c', 'main.c',
+  dependencies: libgtk_dep)

diff --git a/examples/application10/meson.build b/examples/application10/meson.build
index ce842ae794450460817a60c386c75f07d2d7e245..ee076545674a1301314a0ec945ba7fd538aab3b2 100644 (file)
--- a/examples/application10/meson.build
+++ b/examples/application10/meson.build
@@ -1,23 +1,14 @@
-
-app10_resources = gnome.compile_resources(
-  'exampleapp10 resources',
+app10_resources = gnome.compile_resources('exampleapp10 resources',
   'exampleapp.gresource.xml',
-  source_dir: '.'
-)
+  source_dir: '.')
 
 app10_schemas = gnome.compile_schemas()
 
-
-app10 = executable(
-  'exampleapp10',
+executable('exampleapp10',
   'main.c',
   'exampleapp.c',
-  'exampleapp.h',
   'exampleappwin.c',
-  'exampleappwin.h',
   'exampleappprefs.c',
-  'exampleappprefs.h',
   app10_resources,
   app10_schemas,
-  dependencies: libgtk_dep
-)
+  dependencies: libgtk_dep)

diff --git a/examples/application2/meson.build b/examples/application2/meson.build
index 99deae6e1251bf75cc06ccb327be85fc22899f0e..5fb77708295ccc9c7af46cc1f752e5bef40ebdcb 100644 (file)
--- a/examples/application2/meson.build
+++ b/examples/application2/meson.build
@@ -1,17 +1,7 @@
-
-app2_resources = gnome.compile_resources(
-  'exampleapp2 resources',
+app2_resources = gnome.compile_resources('exampleapp2_resources',
   'exampleapp.gresource.xml',
-  source_dir: '.'
-)
+  source_dir: '.')
 
-app2 = executable(
-  'exampleapp2',
-  'main.c',
-  'exampleapp.c',
-  'exampleapp.h',
-  'exampleappwin.c',
-  'exampleappwin.h',
-  app2_resources,
-  dependencies: libgtk_dep
-)
+executable('exampleapp2',
+  'exampleapp.c', 'exampleappwin.c', 'main.c', app2_resources,
+  dependencies: libgtk_dep)

diff --git a/examples/application3/meson.build b/examples/application3/meson.build
index f0cec4c1988046134fe034280eda815923ca3795..ce90523d46eda622db35ccbf4425ec59ef1906cc 100644 (file)
--- a/examples/application3/meson.build
+++ b/examples/application3/meson.build
@@ -1,17 +1,7 @@
-
-app3_resources = gnome.compile_resources(
-  'exampleapp3 resources',
+app3_resources = gnome.compile_resources('exampleapp3_resources',
   'exampleapp.gresource.xml',
-  source_dir: '.'
-)
+  source_dir: '.')
 
-app3 = executable(
-  'exampleapp3',
-  'main.c',
-  'exampleapp.c',
-  'exampleapp.h',
-  'exampleappwin.c',
-  'exampleappwin.h',
-  app3_resources,
-  dependencies: libgtk_dep
-)
+executable('exampleapp3',
+  'exampleapp.c', 'exampleappwin.c', 'main.c', app3_resources,
+  dependencies: libgtk_dep)

diff --git a/examples/application4/meson.build b/examples/application4/meson.build
index 2ae18200b2706d48549d725168722e8c4767b028..70707900016a97b120d7f0472c3fc33338f7e179 100644 (file)
--- a/examples/application4/meson.build
+++ b/examples/application4/meson.build
@@ -1,17 +1,7 @@
-
-app4_resources = gnome.compile_resources(
-  'exampleapp4 resources',
+app4_resources = gnome.compile_resources('exampleapp4_resources',
   'exampleapp.gresource.xml',
-  source_dir: '.'
-)
+  source_dir: '.')
 
-app4 = executable(
-  'exampleapp4',
-  'main.c',
-  'exampleapp.c',
-  'exampleapp.h',
-  'exampleappwin.c',
-  'exampleappwin.h',
-  app4_resources,
-  dependencies: libgtk_dep
-)
+executable('exampleapp4',
+  'exampleapp.c', 'exampleappwin.c', 'main.c', app4_resources,
+  dependencies: libgtk_dep)

diff --git a/examples/application5/meson.build b/examples/application5/meson.build
index f0fed1ca59b9c3c413c020e3e572f4ff248451dc..22d12cb4770354a0b3b4bc3b4dacb97199fe3a15 100644 (file)
--- a/examples/application5/meson.build
+++ b/examples/application5/meson.build
@@ -1,21 +1,9 @@
-
-app5_resources = gnome.compile_resources(
-  'exampleapp5 resources',
+app5_resources = gnome.compile_resources('exampleapp5_resources',
   'exampleapp.gresource.xml',
-  source_dir: '.'
-)
+  source_dir: '.')
 
 app5_schemas = gnome.compile_schemas()
 
-
-app5 = executable(
-  'exampleapp5',
-  'main.c',
-  'exampleapp.c',
-  'exampleapp.h',
-  'exampleappwin.c',
-  'exampleappwin.h',
-  app5_resources,
-  app5_schemas,
-  dependencies: libgtk_dep
-)
+executable('exampleapp5',
+  'exampleapp.c', 'exampleappwin.c', 'main.c', app5_resources, app5_schemas,
+  dependencies: libgtk_dep)

diff --git a/examples/application6/meson.build b/examples/application6/meson.build
index 2d923f35a3504204572c837ffe0e94f9c66a6148..4f9357c706a1bd984ea1f5ac674377efe45ac3f4 100644 (file)
--- a/examples/application6/meson.build
+++ b/examples/application6/meson.build
@@ -1,23 +1,14 @@
-
-app6_resources = gnome.compile_resources(
-  'exampleapp6 resources',
+app6_resources = gnome.compile_resources('exampleapp6_resources',
   'exampleapp.gresource.xml',
-  source_dir: '.'
-)
+  source_dir: '.')
 
 app6_schemas = gnome.compile_schemas()
 
-
-app6 = executable(
-  'exampleapp6',
-  'main.c',
+executable('exampleapp6',
   'exampleapp.c',
-  'exampleapp.h',
   'exampleappwin.c',
-  'exampleappwin.h',
+  'main.c',
   'exampleappprefs.c',
-  'exampleappprefs.h',
   app6_resources,
   app6_schemas,
-  dependencies: libgtk_dep
-)
+  dependencies: libgtk_dep)

diff --git a/examples/application7/meson.build b/examples/application7/meson.build
index cc32f36ad0dd41c196cfce438bb61fbaf5eeee61..2beed866afc203ad8e3754427905601a5acdf5e9 100644 (file)
--- a/examples/application7/meson.build
+++ b/examples/application7/meson.build
@@ -1,23 +1,14 @@
-
-app7_resources = gnome.compile_resources(
-  'exampleapp7 resources',
+app7_resources = gnome.compile_resources('exampleapp7_resources',
   'exampleapp.gresource.xml',
-  source_dir: '.'
-)
+  source_dir: '.')
 
 app7_schemas = gnome.compile_schemas()
 
-
-app7 = executable(
-  'exampleapp7',
+executable('exampleapp7',
   'main.c',
   'exampleapp.c',
-  'exampleapp.h',
   'exampleappwin.c',
-  'exampleappwin.h',
   'exampleappprefs.c',
-  'exampleappprefs.h',
   app7_resources,
   app7_schemas,
-  dependencies: libgtk_dep
-)
+  dependencies: libgtk_dep)

diff --git a/examples/application8/meson.build b/examples/application8/meson.build
index 1192f4d688fa290257632343a2d772049b7bdf30..79819074401832028b3ed566dc80d47d8547f8e5 100644 (file)
--- a/examples/application8/meson.build
+++ b/examples/application8/meson.build
@@ -1,23 +1,14 @@
-
-app8_resources = gnome.compile_resources(
-  'exampleapp8 resources',
+app8_resources = gnome.compile_resources('exampleapp8 resources',
   'exampleapp.gresource.xml',
-  source_dir: '.'
-)
+  source_dir: '.')
 
 app8_schemas = gnome.compile_schemas()
 
-
-app8 = executable(
-  'exampleapp8',
+executable('exampleapp8',
   'main.c',
   'exampleapp.c',
-  'exampleapp.h',
   'exampleappwin.c',
-  'exampleappwin.h',
   'exampleappprefs.c',
-  'exampleappprefs.h',
   app8_resources,
   app8_schemas,
-  dependencies: libgtk_dep
-)
+  dependencies: libgtk_dep)

diff --git a/examples/application9/meson.build b/examples/application9/meson.build
index fccee738cb01a5cba46fdcd43cda3d1167990f4a..d872819d749acb05890d04184edef3035a55ab25 100644 (file)
--- a/examples/application9/meson.build
+++ b/examples/application9/meson.build
@@ -1,23 +1,14 @@
-
-app9_resources = gnome.compile_resources(
-  'exampleapp9 resources',
+app9_resources = gnome.compile_resources('exampleapp9_resources',
   'exampleapp.gresource.xml',
-  source_dir: '.'
-)
+  source_dir: '.')
 
 app9_schemas = gnome.compile_schemas()
 
-
-app9 = executable(
-  'exampleapp9',
+executable('exampleapp9',
   'main.c',
   'exampleapp.c',
-  'exampleapp.h',
   'exampleappwin.c',
-  'exampleappwin.h',
   'exampleappprefs.c',
-  'exampleappprefs.h',
   app9_resources,
   app9_schemas,
-  dependencies: libgtk_dep
-)
+  dependencies: libgtk_dep)

diff --git a/examples/bp/meson.build b/examples/bp/meson.build
index a3f82802f51c9635e327a0327e66b8e3a1f0a685..5bf9b5d851cc63c13650a093db7c34128a79ab7c 100644 (file)
--- a/examples/bp/meson.build
+++ b/examples/bp/meson.build
@@ -1,13 +1,5 @@
-
-bp_resources = gnome.compile_resources(
-  'bloatpad resources',
+bp_resources = gnome.compile_resources('bloatpad_resources',
   'bloatpad.gresources.xml',
-  source_dir: '.'
-)
+  source_dir: '.')
 
-bloatpad = executable(
-  'bloatpad',
-  'bloatpad.c',
-  bp_resources,
-  dependencies: libgtk_dep
-)
+executable('bloatpad', 'bloatpad.c', bp_resources, dependencies: libgtk_dep)

diff --git a/examples/builder.c b/examples/builder.c
index d732068383c7952373bfb3de31ac03a032de1341..eb97a7fc907d202f7440534889377f02fb32484f 100644 (file)
--- a/examples/builder.c
+++ b/examples/builder.c
@@ -1,4 +1,5 @@
 #include <gtk/gtk.h>
+#include <glib/gstdio.h>
 
 static void
 print_hello (GtkWidget *widget,
@@ -15,6 +16,10 @@ main (int   argc,
   GObject *window;
   GObject *button;
 
+#ifdef GTK_SRCDIR
+  g_chdir (GTK_SRCDIR);
+#endif
+
   gtk_init ();
 
   /* Construct a GtkBuilder instance and load our UI description */

diff --git a/examples/meson.build b/examples/meson.build
index 79af2f844041a22550aa1f3f2dfebf4310ff20f7..09dc1bb5c1d8fdd173b75489e50a03e639efeacc 100644 (file)
--- a/examples/meson.build
+++ b/examples/meson.build
@@ -1,51 +1,23 @@
-builder_example = executable(
-  'builder_example',
-  'builder.c',
-  dependencies: libgtk_dep
-)
-
-drawing = executable(
+examples = [
+  'builder',
   'drawing',
-  'drawing.c',
-  dependencies: libgtk_dep
-)
-
-grid_packing = executable(
   'grid-packing',
-  'grid-packing.c',
-  dependencies: libgtk_dep
-)
-
-hello_world = executable(
   'hello-world',
-  'hello-world.c',
-  dependencies: libgtk_dep
-)
-
-plugman = executable(
   'plugman',
-  'plugman.c',
-  dependencies: libgtk_dep
-)
-
-search_bar = executable(
   'search-bar',
-  'search-bar.c',
-  dependencies: libgtk_dep
-)
-
-sunny = executable(
   'sunny',
-  'sunny.c',
-  dependencies: libgtk_dep
-)
-
-window_default = executable(
   'window-default',
-  'window-default.c',
-  dependencies: libgtk_dep
-)
-
+]
+
+foreach ex : examples
+  # TODO: name clash with testsuite/gtk/builder, rename one of the two
+  example_name = ex == 'builder' ? 'builder_example' : ex
+  executable(example_name, '@0@.c'.format(ex),
+    c_args : ['-DGDK_DISABLE_DEPRECATED',
+              '-DGTK_DISABLE_DEPRECATED',
+              '-DGTK_SRCDIR="@0@"'.format(meson.current_source_dir())],
+    dependencies: libgtk_dep)
+endforeach
 
 subdir('bp')
 subdir('application1')